Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 16:01:47 +0000 (09:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 16:01:47 +0000 (09:01 -0700)
commit4f4912ff909b624e384644d0dfa80ab028bd3cdd
treea4531506fd11bbb3b90e781e85eeb743584e7f9d
parent6bf3eea4670f9f7a1447c49e8a5c155a45ffc11f
parentd660037d5f0cf9d66e4544db7e196fb0f673849c
Merge from trunk.